Dekker1/dotfiles
1
0
Fork 0
Code Actions

Update system to current nixpkgs-unstable

Browse Source
This commit is contained in:
Jip J. Dekker 2025-05-01 11:59:52 +10:00
parent 7ad1167f81
commit af39058eb2
No known key found for this signature in database
10 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GhosttyNewWindow.scpt Normal file
View File

@ -0,0 +1,9 @@
tell application "Ghostty"
if it is running then
activate
delay 0.05
tell application "System Events" to keystroke "n" using {command down}
else
activate
end if
end tell

5
darwin/casks.nix
View File

@ -2,6 +2,7 @@
[
# Development Tools
"docker"
"ghostty"
"minizincide"
"qflipper"
"sublime-merge"
@ -21,13 +22,11 @@
# Productivity Tools
"mactex-no-gui"
"raycast"
"1password-cli"
# Browsers
"arc"
# Fonts
"font-playfair-display"
# Games
"battle-net"
]

6
darwin/default.nix
View File

@ -12,7 +12,6 @@
settings.trusted-users = [ "@admin" "${user}" ];
gc = {
user = "root";
automatic = true;
interval = { Weekday = 0; Hour = 2; Minute = 0; };
options = "--delete-older-than 30d";
@ -41,7 +40,7 @@
settings = {
mode.main.binding = {
# Open a new terminal window
alt-enter = "exec-and-forget /Users/dekker1/.nix-profile/bin/kitty --single-instance -d ~";
alt-enter = "exec-and-forget osascript ~/nix-config/GhosttyNewWindow.scpt";
# alt-enter = "exec-and-forget open \"warp://action/new_window?path=$HOME\"";
# Toggle between floating and tiling layout
alt-shift-space = "layout floating tiling";
@ -128,9 +127,6 @@
};
};
# Auto upgrade nix package and the daemon service.
nix-daemon.enable = true;
skhd = {
enable = false;
skhdConfig = (builtins.readFile ./config/skhdrc);

24
flake.lock generated
View File

@ -7,16 +7,16 @@
]
},
"locked": {
"lastModified": 1741126078,
"narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
"lastModified": 1745816321,
"narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "c172f50b55b087f8e7801631de977461603bb976",
"rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
"type": "github"
},
"original": {
"owner": "LnL7",
"ref": "nix-darwin-24.11",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
@ -28,32 +28,32 @@
]
},
"locked": {
"lastModified": 1742234739,
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
"lastModified": 1746040799,
"narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
"rev": "5f217e5a319f6c186283b530f8c975e66c028433",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1742197737,
"narHash": "sha256-PvQSbCujVwq7HLRCPOKEXtCNiI1wEd/WeVYbydfp8NU=",
"lastModified": 1745998881,
"narHash": "sha256-vonyYAKJSlsX4n9GCsS0pHxR6yCrfqBIuGvANlkwG6U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "362df557c21a7ecff3a6efaed0db8b668bf498ff",
"rev": "423d2df5b04b4ee7688c3d71396e872afa236a89",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-24.11-darwin",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}

6
flake.nix
View File

@ -2,13 +2,13 @@
description = "Dekker1's home manager configuation";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin = {
url = "github:LnL7/nix-darwin/nix-darwin-24.11";
url = "github:LnL7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs";
};
};

2
nixos/default.nix
View File

@ -34,5 +34,5 @@
fonts.packages = import ../shared/fonts.nix { inherit pkgs; };
system.stateVersion = "21.05";
system.stateVersion = "25.05";
}

2
nixos/home-manager.nix
View File

@ -4,7 +4,7 @@
enableNixpkgsReleaseCheck = false;
username = "${user}";
homeDirectory = "/home/${user}";
stateVersion = "21.05";
stateVersion = "25.05";
};
programs = lib.attrsets.recursiveUpdate (import ../shared/home-manager.nix {

2
shared/fonts.nix
View File

@ -2,5 +2,5 @@
with pkgs; [
ibm-plex
atkinson-hyperlegible
(nerdfonts.override { fonts = [ "Go-Mono" ]; })
nerd-fonts.go-mono
]

14
shared/home-manager.nix
View File

@ -18,6 +18,19 @@ in
};
};
ghostty = {
enable = true;
enableZshIntegration = true;
installBatSyntax = false;
# Install using Homebrew because of build failure
package = null;
settings = {
font-family = "BerkeleyMono Nerd Font Mono";
font-size = 14;
theme = "light:catppuccin-latte,dark:catppuccin-frappe";
};
};
git = {
enable = true;
aliases = {
@ -85,6 +98,7 @@ in
nitrogen = {
hostname = "nitrogen.dekker.li";
user = "jdekker";
port = 5821;
};
m3 = {
hostname = "m3-login3.massive.org.au";

4
shared/packages.nix
View File

@ -1,7 +1,6 @@
{ pkgs }:
with pkgs; [
# General packages for development and system management
hut
ltex-ls
mas
mdbook
@ -21,7 +20,7 @@ with pkgs; [
# Fonts
ibm-plex
atkinson-hyperlegible
(nerdfonts.override { fonts = [ "Go-Mono" ]; })
nerd-fonts.go-mono
# C(++) development tools
bison
@ -38,6 +37,7 @@ with pkgs; [
# Rust development tools
rustup
trunk
# MiniZinc solvers
gecode